From: Keir Fraser <keir@xensource.com>
Date: Mon, 1 Oct 2007 05:35:40 +0000 (+0100)
Subject: Revert 15975:96f46954c7f1.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14937^2~2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=6fe6158fdfed72acc8222620383f499f9dd2e2fe;p=xen.git

Revert 15975:96f46954c7f1.
---

diff --git a/xen/include/xsm/acm/acm_hooks.h b/xen/include/xsm/acm/acm_hooks.h
index bb6ed02c31..54bd15e2a0 100644
--- a/xen/include/xsm/acm/acm_hooks.h
+++ b/xen/include/xsm/acm/acm_hooks.h
@@ -284,12 +284,17 @@ static inline int acm_domain_create(struct domain *d, ssidref_t ssidref)
     } else if ((acm_secondary_ops->domain_create != NULL) &&
                 acm_secondary_ops->domain_create(subject_ssid, ssidref,
                                                  domid)) {
+        /* roll-back primary */
+        if (acm_primary_ops->domain_destroy != NULL)
+            acm_primary_ops->domain_destroy(d->ssid, d);
         rc = ACM_ACCESS_DENIED;
     }
 
     if ( rc == ACM_OK )
     {
         acm_domain_ssid_onto_list(d->ssid);
+    } else {
+        acm_free_domain_ssid(d->ssid);
     }
 
 error_out: